Fix environmental damage sources #6515
Conversation
- Vehicle damage would never occur because it doesn't fire all the hitpoints - Missing sanity check on fall damage to check that unit isn't in a vehicle - Getting hit by a vehicle while on foot can be detected by checking for a shooter
kymckay
added
kind/bug-fix
| if (_ammo isEqualTo "") then { | ||
| if (velocity _unit select 2 < -2) then { | ||
| // Downward velocity indicates falling damage | ||
| if ((vehicle _unit == _unit) && {velocity _unit select 2 < -2}) then { |
There was a problem hiding this comment.
I think I actually need to swap the fall damage check with the hit by vehicle check (to handle the extreme edge case of being hit by a plane/helicopter while skydiving).
There was a problem hiding this comment.
This is more a suggestion for code legibility. I like putting brackets to separate commands, etc...: {((velocity _unit) # 2) < -2 }
We can use also vehicle _unit isEqualTo _unit
There was a problem hiding this comment.
The quickest way to check if a unit is on foot is actually _unit in _unit, we should probably have added a macro for that to CBA ages ago
There was a problem hiding this comment.
OBJECT in OBJECT is pretty slow.
There was a problem hiding this comment.
Oh really? I figured because it was one less command it'd be faster 🤷♂️
Still, an IN_VEHICLE(unit) (alternatively ON_FOOT) macro would improve code readability imo (it's more clear what's being checked).
| private _vehicle = vehicle _unit; | ||
| if ( | ||
| _hitPoint isEqualTo "#structural" && | ||
| _ammo isEqualTo "" && |
There was a problem hiding this comment.
lazy evaluation also on the second condition {_ammo isEqualTo ""} &&
| if (_ammo isEqualTo "") then { | ||
| if (velocity _unit select 2 < -2) then { | ||
| // Downward velocity indicates falling damage | ||
| if ((vehicle _unit == _unit) && {velocity _unit select 2 < -2}) then { |
There was a problem hiding this comment.
This is more a suggestion for code legibility. I like putting brackets to separate commands, etc...: {((velocity _unit) # 2) < -2 }
We can use also vehicle _unit isEqualTo _unit
- Correctly identify a piloted vehicle hitting a falling unit - Correctly identify burning damage while falling
|
Did some more testing and debugging and have updated the code to better handle situations where damage could be classified incorrectly (burning while falling and hit by vehicle while falling) |
| // Significant damage suggests high relative velocity | ||
| // Momentum transfers to body/head for worse wounding | ||
| if (_receivedDamage > 0.35) then { | ||
| _woundedHitPoint = selectRandom ["Body", "Head"]; |
There was a problem hiding this comment.
I feel like we should actually raise an additional wounding event in these cases (if you hit the ground at high speed the injury wouldn't fully transfer to your body - you'd still break your legs).
|
So we can probably merge this now, but it definitely needs testing in multiplayer environment (in particular vehicles crashing with multiple players inside - I'm confident everything other than this will behave the same as in singleplayer). |
|
We need to do various test sessions in MP anyway, better we merge this in now, so we can combine that effort. Anything in particular that makes you say we need to pay attention to those scenario's specifically in MP, @SilentSpike ? |
|
Yeah just because a vehicle crashing is the only kind of damage where I could see potential for locality to introduce a change in behaviour. If you're not the driver then the vehicle isn't local to you (I believe) so it's possible that the handle damage EH could fire differently (e.g. maybe it does fire for all hitpoints and not just structural) for such passengers. ShackTac have also reported that they've observed issues with passengers not taking damage when vehicles crash (example being a helicopter crash) in the dedicated environment - admittedly that's on the old code which in my testing never correctly identified vehicle crashes at all. |
correct. Except the driver is a local AI. |
* Tidy handle damage code * Fix environmental damage conditions - Vehicle damage would never occur because it doesn't fire all the hitpoints - Missing sanity check on fall damage to check that unit isn't in a vehicle - Getting hit by a vehicle while on foot can be detected by checking for a shooter * Improve collision handling - All collisions have a `_shooter` so we simply first check for that because burning doesn't and it could happen at any velocity - We don't actually care what caused the collision because they should all cause the same type of wounding - The exception is fall damage because we want to prioritise wounding the legs, we assume if the `_unit` had downward velocity and `_shooter == _unit` that it was fall damage (not necessarily always true, but almost always is and there doesn't look to be a more specific way to check).
When merged this pull request will:
There was no sanity check on fall damage to see if the unit was in a vehicle to avoid weird edge cases.Outdated, we now first check for a_shooterto handle this.Being hit by a vehicle would work (unintentionally), but was not explicitly checked for - which is now done by checking if a shooter exists.Outdated, we now only check if a shooter exists to know collision damage has occurred, it's irrelevant if a vehicle caused it.I tested all of this in the editor and can confirm the added traces for each damage source now fire when expected.
Point of interest: as you can see in the comments, vehicle collisions do fire the EH multiple times and that seems to scale to crash intensity so I think we can just let it happen and avoid complicated code to work around that.